Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:35:29 +0000 (09:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 16:35:29 +0000 (09:35 -0700)
commitc3356e0e9d333519ef909d8e185ef1a7eeb8846b
treee893bc55595b8b025db87ad4a0bed345ef556af5
parenta2be1092c1563a3a20e5bf6e35e939553937604f
parent8f00a9d3f05a084c699e68d23d24996c6c19aca7
Merge from trunk.